From: Chong Yidong <cyd@stupidchicken.com>
Date: Tue, 30 Jan 2007 16:52:48 +0000 (+0000)
Subject: (image-mode): Don't automatically view as image.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~2531
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=fafd2c20b6824a6bacfcc47c1751552f73992f46;p=emacs.git

(image-mode): Don't automatically view as image.
---

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 5b24aa316dd..97f1a7902dc 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -60,17 +60,11 @@ to toggle between display as an image and display as text."
   (setq major-mode 'image-mode)
   (use-local-map image-mode-map)
   (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
-  (if (and (display-images-p)
-	   (not (get-text-property (point-min) 'display)))
-      (image-toggle-display)
-    ;; Set next vars when image is already displayed but local
-    ;; variables were cleared by kill-all-local-variables
-    (setq cursor-type nil truncate-lines t))
   (run-mode-hooks 'image-mode-hook)
   (if (display-images-p)
       (message "%s" (concat
 		     (substitute-command-keys
-		      "Type \\[image-toggle-display] to view the image as ")
+		      "Type \\[image-toggle-display] to view as ")
 		     (if (get-text-property (point-min) 'display)
 			 "text" "an image") "."))))